Allow CPU frequency option on x86_64 for privileged guests.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/buildconfigs/linux-defconfig_xen0_x86_64 b/buildconfigs/linux-defconfig_xen0_x86_64
index 5ea65c8464dff4f41200d5c817f97f16fb970f78..3406bc7a4a1b2ae821af4110c09ee6b36376b4b2 100644 (file)
--- a/buildconfigs/linux-defconfig_xen0_x86_64
+++ b/buildconfigs/linux-defconfig_xen0_x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16-rc3-xen0
-# Thu Feb 16 22:55:30 2006
+# Mon Feb 20 11:37:43 2006
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -161,6 +161,11 @@ CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set
 
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
 #
 # Bus options (PCI etc.)
 #

diff --git a/buildconfigs/linux-defconfig_xen_x86_64 b/buildconfigs/linux-defconfig_xen_x86_64
index c48a7b4a9c3e6d887c4eb7afab4ec76dc5f593ab..b8b5ea90cc3378f1e8dd9e79f6da2f0d1c1972e3 100644 (file)
--- a/buildconfigs/linux-defconfig_xen_x86_64
+++ b/buildconfigs/linux-defconfig_xen_x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16-rc3-xen0
-# Thu Feb 16 22:56:25 2006
+# Linux kernel version: 2.6.16-rc3-xen
+# Mon Feb 20 11:37:11 2006
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -169,6 +169,11 @@ CONFIG_ACPI_POWER=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_CONTAINER=m
 
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
 #
 # Bus options (PCI etc.)
 #

diff --git a/linux-2.6-xen-sparse/arch/x86_64/Kconfig b/linux-2.6-xen-sparse/arch/x86_64/Kconfig
index e7f7907c18d47f643fa786a5863e1dafdfeed276..be4c1e0301144c0493a1e87fc82526b473db8d7c 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig
+++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig
@@ -529,9 +529,7 @@ endif
 
 source "drivers/acpi/Kconfig"
 
-if !X86_64_XEN
 source "arch/x86_64/kernel/cpufreq/Kconfig"
-endif
 
 endmenu